Skip to content

Formatter: Fix ERB text flow formatting to keep adjacent inline elements together#1010

Merged
marcoroth merged 3 commits into
marcoroth:mainfrom
ydah:903
Mar 2, 2026
Merged

Formatter: Fix ERB text flow formatting to keep adjacent inline elements together#1010
marcoroth merged 3 commits into
marcoroth:mainfrom
ydah:903

Conversation

@ydah

@ydah ydah commented Dec 25, 2025

Copy link
Copy Markdown
Contributor

Fixes: #903

@ydah @marcoroth
Fix ERB text flow formatting to keep adjacent inline elements together
543f4a4 
Fixes: marcoroth#903

Co-Authored-By: Marco Roth <marco.roth@intergga.ch>
@navidemad

navidemad commented Jan 10, 2026

Copy link
Copy Markdown

Really nice feature :)

@marcoroth marcoroth changed the title Fix ERB text flow formatting to keep adjacent inline elements together Formatter: Fix ERB text flow formatting to keep adjacent inline elements together Feb 13, 2026
marcoroth
marcoroth reviewed Feb 13, 2026
View reviewed changes
Comment thread javascript/packages/formatter/test/html/text-content.test.ts Outdated
marcoroth
marcoroth reviewed Feb 13, 2026
View reviewed changes
Comment thread javascript/packages/formatter/test/erb/whitespace-formatting.test.ts Outdated
marcoroth
marcoroth reviewed Feb 13, 2026
View reviewed changes
Comment thread javascript/packages/formatter/test/erb/whitespace-formatting.test.ts Outdated
marcoroth
marcoroth reviewed Feb 13, 2026
View reviewed changes
Comment thread javascript/packages/formatter/test/erb/whitespace-formatting.test.ts Outdated
marcoroth added 2 commits March 2, 2026 02:29
@marcoroth
Merge branch 'main' into 903
324c339 
# Conflicts:
#	javascript/packages/formatter/src/format-printer.ts
@marcoroth
Use expectFormattedToMatch
ce8c732
marcoroth
marcoroth approved these changes Mar 2, 2026
View reviewed changes

@marcoroth marcoroth left a comment •
edited
Loading

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ydah Sorry for pushing to your branch multiple times, but this should be fine now and should have all the complicated git conflicts resolved, thank you! 🙏🏼

@marcoroth marcoroth merged commit 9c52f1a into marcoroth:main Mar 2, 2026
12 checks passed
@ydah

ydah commented Mar 2, 2026

Copy link
Copy Markdown
Contributor Author

@marcoroth Thank you🙏

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@marcoroth marcoroth marcoroth approved these changes

Assignees

No one assigned

Labels

formatter typescript

Projects

None yet

Milestone

v1.0.0

Development

Successfully merging this pull request may close these issues.

Formatter: Newline added before . that follows ERB tag plus other issues, perhaps related to <br> tag

3 participants

@ydah @navidemad @marcoroth